GtkAccelLabel: Drop use of GtkMisc
authorMatthias Clasen <mclasen@redhat.com>
Fri, 23 May 2014 02:53:17 +0000 (22:53 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Sat, 24 May 2014 04:04:41 +0000 (00:04 -0400)
Just use 0 instead of xpad.

https://bugzilla.gnome.org/show_bug.cgi?id=730613

gtk/gtkaccellabel.c

index fbd0943c5cfe1a6e628c534cf2454d7d3bd794dd..ec4d17ab14c17ec1d2c6b286e9c8fa5128c9d146 100644 (file)
@@ -397,7 +397,6 @@ gtk_accel_label_draw (GtkWidget *widget,
 
       gint x;
       gint y;
-      gint xpad;
 
       context = gtk_widget_get_style_context (widget);
       label_layout = gtk_label_get_layout (GTK_LABEL (accel_label));
@@ -427,14 +426,10 @@ gtk_accel_label_draw (GtkWidget *widget,
 
       cairo_restore (cr);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-      gtk_misc_get_padding (GTK_MISC (widget), &xpad, NULL);
-G_GNUC_END_IGNORE_DEPRECATIONS
-
       if (direction == GTK_TEXT_DIR_RTL)
-        x = xpad;
+        x = 0;
       else
-        x = gtk_widget_get_allocated_width (widget) - xpad - ac_width;
+        x = gtk_widget_get_allocated_width (widget) - ac_width;
 
       gtk_label_get_layout_offsets (GTK_LABEL (accel_label), NULL, &y);